Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 07:24:47 +0000 (23:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 07:24:47 +0000 (23:24 -0800)
commite8a4253c1a3fa9c5dda5e8c8752fe0d63a3a84e3
treeb2a0bf576ec37ea18750b32c61c796c2a621c7e4
parent908e54cf651a840830fb28943701a9ef9a282922
parent11ed5675b53131a5d00a0e8ff1848ddd43641b5f
Merge from trunk.